Some modifications using Pierre's advices