Tweaks to make the system work.

Basing things not off of GPSID vs TruckID