update datafiles to include censorship
minor fixes/cleanup; add censorship

* minor fixes/cleanup
* point to new datafile
* read censorship state