Updates/edits plus prepping for push to Heroku