various indexing fixes and updates