various fixes
Merge pull request #2 from pzurek/various-fixes

various fixes