Revert "various improvements / fixes"
Merge pull request #2 from jonbrown21/revert-1-fixes

Revert "various improvements / fixes"