various changes before deploying to heroku