thank fuck most things still work
various tidy-ups, sorting proper, etc