Latest purq improvements

See individual commits