more atom validation tweaks