Formatting & bug fixing animations.  Lame, same CL, I know...