Clean up and fixes to index