jespino Some corrections and improvements