more work on location info handling