Fixed up a lot of nulls added in Data Analyzer

still a couple hangers-on though.