p16 in C++ and bigint modifications for faulty indexing type in addition