Fixes for a few bugs in MAEC40 Module and Mappings

This fixes a few outstanding bugs in the MAEC4.0 output module and API call mappings.