Some small changes to the main driver.