Bug fixes, cleanup, added an animation component.