Driver edits and bug fixes.