Small edits getting ready for new round of efficiency tests.