Changed handling of terms.
Added ability to reset previously set terms.