INDEX all fixes
Merge pull request #11 from coderiver/index-finish

INDEX all fixes