index master  more fixes