tweaked driver, fixed a couple bugs