Update driverVersion method. Tidy up a few other methods.