some timing tweaks, probably other things