Tidy / correct some docs and comments