major refactoring
minor bug fix
fetching country and continent info too