Minor workflow Mapping changes

little updates