Changes to the index with bug fixes