a few more refinements to civic.y (12th March)