various cleanups and improvements; also include the 1st try on the shape-only distribution (stat.errors only for now)