changes...
Some haskell changes