Indices fix + comment fix & nbr + some fixes