added function UpstreamSLCClasses(), bug fixes elsewhere