touch up some stuff, and only include official devices