minor fixes, added mailbox to Duarte's server