some timing changes and also some cleanup