Sounds good, I'll make all these changes a little later today. I'm also almost done the email templates module.