doc and code changes