cleanup and scrum animation timing adjustments