added missing mappings
minor edits
aligning the code for both NONMEM and TrialDesign versions….

more changes to come with changed Mapping type