Lots of data structure fixes
Yet more mispelled fields and mapping updates