Fix a UTI.
Moving some stuff around…
And general fiddling.