Fixed errors with Heroku
Fixed some bugs