fix up documentation
add back constraints, and VarTest