complete redesign of s2plot. classes renamed