corrections and improvements