Made device info actually put some stuff into the map. More general work.