Lots more doc cleanup