Comments and improvements