Fixed some issues and updated gemfile for heroku