some cleanup for tlc, and also fix for PO # not saving