more small changes
Merge pull request #167 from mwernimont/master

more small changes