removed unnecessary code & expanded GPS timeout