misc fixes
Merge pull request #43 from Clever/fixes

misc fixes