changes for heroku
merged changes to make heroku run properly