Performance counter changes (WIP)

is it enough though?