Import from OpenStreetMap works a bit
Minor changes