last stuff for the initial 2.2 release