Changed some stuff to work with heroku.