– Bug fixes.
– Simplified some CSP constraints.