Add location info.
Minor changes.