update the devices it works with

fix some text and comments
shorten some if conditions
All code improvements like this have been merged.