AI bugfixes, better combat processing