fix timing issues in battle state