Changes to try and catch data issues.
Lots of little hacks to get around and eliminate missing or corrupt data entries.