fixes #7 & added animations