more changes for the sake of deploying to heroku
heroku specific changes
morke
heroku changes
more changes.