Improve accuracy of CPU activity

I took some shortcuts for the calculation of the CPU activity. While it looks ok, it might not be entirely accurate. Need to double check the context switch thread in/out more closely to see how this could be improved.