Ok

Minor corrections

Not done

Not applicable