'Small' corrections from reviewer 1

Includes anyway a few rewrite of sections
'Small' corrections from reviewer 2