fixed a typo and changed a string in the --version output
merged cosmetic changes from master