Some fixes to animations and the previous few commits.