Quick tidy up, added city name. ALPHA RELEASE a0.1