rewritten country module | bug fixes in parser