general fixes
Merge pull request #72 from lewenhagen/master

general fixes