Clean up content a bit
Updated affiliate management
Update email stuff