fixed heroku failure plus minor tweaks