various updates and additions