miscellaneous fixes
Merge pull request #79 from bayendor/miscFix

miscellaneous fixes