country aggregation

and some corrections