fixes + counter caching