geo location + bug fix