Improved error catching and ui
Changed city names to state names for continuity