Little changes to the code of Well