Yet more tweaking

I'm probably fixing things in a way that breaks things else where