Some animation bug fixes.
Merge pull request #2 from andallas/f-Animation-Updates

Some animation bug fixes.