More combat stuff added