added clojure and haskell plugins, misc changes