Added a few things, mainly changed how combat works.