Fix bug with CPU not being collected.  Improve CPU accuracy