Multiple changes requested by JT, including email list and cosmetic changes