More bugs fixed (testing was deleting all atom folders)
Small fixes...