slight re-ordering
all countries updated
database methods for get added