more todos
Animation improvements.
more animation related changes
typo fix