Minor changes to functions.
More detailed location information