Added more animation things

Also fix a couple bugs with animation.