more instrument mode crap, some stuff now in driver