Improve accuracy of CPU, wait time for activities

Improve accuracy of CPU, wait time for activities