Delegate Methods + Animation Bug Fixes