yet more last minute tweaks