tidied all mappings, reordered fco mappings