Trying to fix jedi
merged
Added more pymode things