Lots of doco changes