fix missing comma
fix a few things
Merge pull request #3 from nathanielksmith/master

fix some bugs