I've committed -3 and -4 from your work. Can you please post an updated diff against what's in -HEAD now? I have updated firmware here that I'm going to commit soon, including the newer device firmware. But I do want to test on the 4965 first just to make sure it still 'works'. Thanks! -adrian