removed ordered field names, fixes and names changes to field-map and fields-map, as well as the addition of a sort. Fixed up the tests a bit.