Ooops.. v20 broke something.. likely running too long with interrupts masked.

Working on v21 now..