Cleaned up util.clj and other small changes.