misc fixing before pusing to heroku