Little better logging, fix message formatting, but email works