minor code updates and important documentation changes for release 2.2