fix some stuff
Merge pull request #1 from maxogden/fixes

fix some stuff