Cleaning up

Plus some corrections and additions.
Merge pull request #202 from Winnetou/patch-4

Cleaning up