conversion to sig*jmp variants
cosmetics
sync some crud