Fixed docs in response to QA remarks