added some combat stuff