Location fields not imported/not available

Two issues:

I have a CSV containing restaurant listings that includes lat/long as well as full addresses, with each locational element in a separate field. I have set up a content type that has a full set of locational elements enabled via the location module (street, city, lat/long, etc.) that matches the CSV.

1. The matching routine only has location field options for country, latitude, and longitude. It does not offer options for address, city, postal code, or phone number, even though these are set as either 'allow' or 'required' in the content type location field collection settings.

2. When I run the importation, the preview screen shows that the latitude and longitude have been captured, but when the final import is run, these are not dropped into the location table. I am able to successfully add full locations using 'add content' - it is only when I am running node_import that locations cannot be added.

Thanks.