new TODO and small email changes