email sending && cosmetical changes