added mailserver config and other small fixes