bugs fixed
 for heroku