Correction and improvements to documentation