Clean up pull request #3

These are all the additions from pull request #3 that add the entire entry for the device. Please close the other pull request. Thanks.