Updates to objective function, general alg, exp design