make all 's' variables which refer to Sets be called some form of 'set' instead