Finished Speed beacons

fixed other bugs that messed up looking up of beacons.