final changes ready for heroku