Feature capacity market vx2

I merged the bug-removals and new stuff from develop into your VX2 branch.