bug fixes and documentation on animations
merge changes