Minor changes to combat class, and addition of one method to member
class