Tweak a few details