GPS Fix and some reworks