improve GPS handling