Updating the final tweaks with info from ed