o fix device ids
o fix formatting