Manu corections everywhere

A lot of minor modifications