fix indent and add country support