Doc update and tidy up.