further updates to gen/driver