Refactor some more; fix time animation.