added Haskell template.
Various small changes.