fix up na handling and note choices in doco