scaled atoms, minor optimizations