changed mail and clean up