updates, also clj refactor