trajectory sampling mostly working, fix some issues with driver/loopback