sp
various changes