remove atom, add node explicitly, some renaming