#1 fixes. JAX.Event added