index updates and small fixes