Bug fixed galore and tweaks and such
Heroku bug fix
Fixes