Doco improvements
Tidy ups