more fixes to index