Minor updates to mailroom, still need report function