closing in on final tweaks