Update comments & doco