More changes. Fixed bug in setCurrentLocation.