Tweaks, fixing a problem with new cleaners overwriting each other