various fixes to the process definition, related to mapping mostly