Bit more work on #958, add summary and indicators for monitoring features