fixes + change stringofterm
merge