missing email port and cleaned up some options