Updated stuff, and haskell mode for emacs:)