changes to maybe make it work in heroku
took out a few lines I forgot to
commented things for code review with Rob