fixed bugs
ready for heroku, again