fixes and indexing research