various updates to not block UI etc