many cleaning and changes to the big part of spc