cleaned up and made a couple fixes
Merge pull request #3 from b91961/master

cleaned up and made a couple fixes