detect more devices
minor changes