added some things for heroku
Fixed failing tests
cleaned up model