final edits before submission
Merge branch 'master' into compile