Finally managed to merge Andrea Bittau work on ack vector records and CCID2, after reworking some bits.
Also made ostra for the first time work with a userspace app, in fact a X.org library, next week will continue working with Gustavo Boiko on tracing not just the Xdisplay (IIRC) struct, but the Xevent one as well (that thing is in need of some of the treatment I gave struct sock in the linux kernel some years ago, class hierarchy with per Xevent derived class slab caches, etc).