WP6 bits and NT2

Not done all of WP6.
Changed NT2 -> NT^2