fixed dist. check with two drivers, misc. fixes