Documentation, some tidyup