finally fixed up the location service