clean up a few civics, more work on routing.