Fixing GPS and timer code

GPS is working again. Tested with fake GPS points from DDMS