fixed do/doall mixup in map
better idiomatic clojure (thanks kibit)
even more idiomatic clojure (thanks kibit)