tested without GPS, lots of bugs fixed