more SCs and ESPs fixed.