various updates, fixes