More adjustments and improvements