added clojure support and a few tweaks