various updates

various updates