Further tweakery
Bugfixes