Updated schema for smtp, cleaned up errors