confirmMailing added, other things tweaked