touched up code and heroku setup