several fixes in index