fight logic fixes