Feature/capacity market vx2

Integrated a bug fix in the base model.