Customizable email subject block (#1) and other cleanup