Updates mostly from CP Stylebook

also whitespace