fixed up a few things
Merge pull request #1 from philspitler/master

fixed up a few things