lots of jit fixes