Bug fixes and refinement of the text previous commit