some comments updated