more atom fixes