Comment for index format + bugs fix