Battle update: no more one-frame battles!
Header fixing