Update more doco & comments