ji stuff
fixes