More filling in blanks in set.cpp