SLE and XM fixes; preparing to introduce categories