added criteria to location.

Not sure that actually makes things better. Location in android seems
far from ideal.