Final Atom Tweaks