Updated to Atom version 1.0 specification. Behavior now satisfying, code cleanup pending.