more updates to indexing framework, bug fixes