-- various updates