Yay, animations and fixes
merges.
Almost ready?