More work on hardware detection. Far from being finished