Some final tweaks