added some comments from the current 3.x-dev branch