Merge "More stuff I need for the proc stats UI." into klp-dev