bug fixes, including animation exceptions