Couple of fixes to `raw` summary
Add rank to JSON output