Updated changes, and improved Heroku deployment