Add animation and fix some more bugs.