Doco and some reorg.