DNA fixes

Fixes the naming issues tied to cloning.
Extinguishers

Duck, thank you.