improvements in index
issue #1