fixed clojure stuff
merged