added better combat handling