Document updated following Merlin's recomendatios. New content to section 8.3 and 8.5