check in various edits made to live version