various updates and fixes.