update/rebase more drivers