Indexing script improvements, small setup fix