Improve location listener (WIP).