Extensive work on documentation