SZ-22: final updates per code review, along with updated docs and tests