Remove some TODOs that have been fixed.
Use the ATOM_APP variable where appropriate.