Edited some stuff, added haskell and jedi support