a few clean-up tweaks
Merge pull request #6 from stevekaten/master

A few last second tweaks