added animations, tidied up a bit