A lot of minor fixes
Merge pull request #2 from WouterJ/patch-1

A lot of minor fixes