various updates and fixes