Adding the index section and other corrections.