Dev updates to fix_issue_157

post update housekeeping. Grrrrr.