table adjustments and mail server enhancements