resolved problems are working, note names are showing up, plus some mailer work
merge conflicts resolved