Minor revisions and Partial Email Script