seperate out global variables.  Mail fixes