+Pair class, minor changes