various updates and resequencing prior to merge with keithp