various updates and amends