general improvements; still wokring on finding API to query country and retur city