manual changes and improvements