FIxed location bugs
Changes to the way we tore city data