Made various minor improvements
Merge pull request #75 from ravage84/index-improvements

Made various minor improvements