fixes + counter added