Some combat improvements! Be sure to add these fixes if you downloaded before this commit.