for heroku deployment
a few bugs fixed