More work
Misc
More work
More of the same, half-working again
Misc
General fixing