Modify comments and some fix

do not display some error message
Merge branch 'rmaster'