DOC : fix typos/rouge comments
ENH : made demo code a bit more flexible