POI class extended

country ISO code implemented
cleanup