Added haskell and tweaked some keys