added mailboxes and fixed forms