Misc changes after review by SET framework authors