Remove trailing whitespace; small fixes in config file contents.