more changes to get it ready for Heroku