country aggregation now almost complete

plus a little housekeeping here and there