Add devices and minor fixes.
#WIN