Bug fixes
Style
WIP: refactor PmtaRecipient