Lot of fix/update + Add GPS support