Bit more work on #958, add waited time column, put units on blocked/waited time fields