Lots of various improvements
Merge pull request #24 from mdboom/lots-of-improvements

Lots of various improvements