More tweaks from my read-through

@MichaelDiBernardo  sorry, I had meant to get this done a little quicker!