Some doc fixes and minor reorganisation.