various updates and fast timing