AnimationQueue Improvements

Resolves #1219