Updated map support
Fixed GPS coord code