apply updates from heroku; rebrand