rework s problem set titles and organization, per Matt