Finished off indexlot and collection bug