fix typo, add other types (set, count)