Some corrections (not sure if everything is ok)