stuff for heroku and some style fixes