final email fixes