Add email scripts + other minor modifications