small fixes and index update