updated combat a lot of bugs still, will clean up.