fixed combat and flailing