DOC: Fixes in response to Imri's feedback.