[FIX/DOC] various small changes
[MERGE] merging changes on remote