another small set of fixes
Merge pull request #19 from qnikst/master

another small set of fixes