minor final tweaks