While we're at it, implement 'else' cor the config file conditionals. Also fix some compile warnings and improve docs.