more cleaning, some fixes, new drivers