Edits To Fix Heroku Issues