Some cleanup. Add haskell.
Some cleanup.