Fixed lots of bugs, added animation