Better commentary display - fixed sorting!