fixed fighting + small fixes