merged changes for heroku
more minor changes to grammer for heroku!