refactor
fixes to count-min to make it work with tworound