fixing heroku bugs
further bugfixing