Comments in Atom class, and some bugs