doc and code-standard corrections