Unicorns, Heroku, and minor corrections