Lots of small changes to census2

Lots of small changes to census2