Forgot to include a couple of final edits

Forgot to include a couple of final edits in the previous commit