Use idiomatic (seq) over (not (empty?))
Various fixes/progress