various fixes in index