Some changes in makefile, and Atom.cpp