Improving census eval, still not quite done