minor stuff
merge
begining anim fight + correct bugs