Changes from heroku, small updates