More bug fixes and updates to the 'new' indexer