improving use of the current location, and adding help message