Doco, cleanup, small fix