Add comments
Fix current location
Add check for first city to reset to get current location