Tweaks on jedi mode