Merge pull request #4 from megantaylor/master

fixed a bunch of small bugs
Merge pull request #5 from megantaylor/master

making prettier