cleaned up code
merge b/t small-fixes and master in progress
Merge pull request #8 from greenteawarrior/small-fixes

cleaned up code