Added missing node name.
More tweaks for vars.
More target cleaning.
Fixed up Clojure code.