various cleanups
Merge pull request #200 from jackalope/cleanups

various cleanups