beef up bench and tests, fix count bug
rename, fmt