zw - first few corrections
zw - making a series of fixes
Merge pull request #8 from zwarburg/miscFixes

Misc fixes