Updates to the measure_loc tool