added a bit of combat stuff i think..