move to the One True Way for heroku
handle debug better
fix
fix