comments
comments
comments and minor Set<> cleanups