Added more files to clean.
Added more robust string handling for terms.