Fixed some combat stuff, changed weapons