mail and some other improvements