many bugs removed on when line change during fight