minor updates to Driver