ADD: response matrix pairing, and some minor changes (hint(s))