More comments, fixed CategoryList bug

Headers can now be removed from the CategoryList.