driver added, few fixes