Bug fixes and added driver.