fix everything after going back to clojure