Bug fixes
WIP: refactor PmtaMessage
Bug fixes