tick version for 2.2.0 release; other minor cleanup