Doco improvements