white space
int-1.d: Fixes and extensions.
duh + device ids
That works a bit better
work in progress (i.e. no working yet).