more fixes on timing