Fixed some environment issues, deploying to heroku