Some more beacons and debugging improved