Combat framework... part 2 1/2

fixed a couple things at Void Director's suggestion :)