general cleanup
Merge pull request #25 from lavelle/fixes

General cleanup