More edits with @amirmc, still need to add Leo's table and fill in hrefs