driver and minor changes