little fixes and adjustments
Merge pull request #33 from softprops/little-tweaks

little fixes and adjustments