fold in changes from proposed_changes_branch, massage style