My full e-mail address & some fixes