Fix atom and add some comments.