add some suggestions from ajacoutot@
add some suggestions from ajacoutot@