p2c_a, p2c_b, p2c_abd added, also small fixes

Model 2 is completed.