Added a few stats, cleaned up other stats
Collect iowait data