All changes from handoff meeting

Just works better all over, especially on Heroku