Made more changes suggested by @mikehearn

A bunch of changes suggested by @mikehearn 

Note: in the absence of critical feedback, I will merge this request around 20:00 UTC on March 24th.