multiple fixes and changes to the privacy cleaner