MOD: a bit of clean up in merge. no concurrency yet, to be added later today. missing implementations are now detected (might have been in previous commit)