Final changes in prep for running on Heroku.