Bugfixes, Added Country and State codes to Location object