more changes, mainly to the symbolic rewriter