Minor tweaks and doco tidy up