minor driver changes, spacing and comments