cleaned up haskell
broke .6