various updates ...