[FIX] combat

stuff everywhere