added del_atoms, playing with Ef calc, some more TODO