more sections and improvements to index