some timing fixes