Update index, fix errors