update w/ a few changes from python-opencivicdata