updated state to include country and cities
updated cities to include country and state
fixed errors with notepad links