clean up, fixed mailing