jedi specific commits + minor