some minor final tweaks