Minor improvements. Structure changes. TODO update. Improved the
emailText generation