Only include section number in rhs links

Also unintentionally includes a fix for comments in the list. The rest of that patch will come later