doc and code comment update