Added some animations, reverted a couple of things