typo fix and some timing updates