minor changes, including z3 c solver