Responding to QA on OPM reports

several relatively minor changes.  Check commit messages for more detail