More methods and the tidy-up of documentation