some more half-backed changes for the new customization engine