Fixed some things
changed some things
Merge pull request #21 from kristenmills/master

things