Animation Control : cleanup and fixes