[enh] added classification of devices, some fixes