many more height-fitting tweaks