comments and improvements