Some more tweaks, still a lot to do.