Refactors, some stuff that never made it up but is already on Heroku.