index - more fixes