Massive update corrects many off-by-one errors & fixes multi-opt