minor improvments to index and settings