fixup
various updates