corrected some timing issues