Set version to 2.0; clarified some comments