Part 2: add missing device data, fix missing device line, make import more robust.