desalinate data

Update parser usage to use single entry point, desalinate.
Includes many fixes to most records.