More small fixes
Merge pull request #4 from fatalbanana/master

More small fixes for index