small error correction
another proctest
more mailer work
merger updates