Added weights for indexes
Removed some comments
Merge branch 'adding-weights' into develop
Merge branch 'develop'