Further work on mappings and element rehaul.