small edits of issue 645 and 646
some edits
Merge pull request #648 from kerautret/someCleanings

small edits of issue 645 and 646