Updated the mail system - cleaned out a few bugs.