Adding improved namespacing for debugging
Atom2 fixes after testing