JIP fix

and some changes for convenience spectator