adjustments and improvements