More corrections and improvements