fixing some bugs and merging mailchimp fixes with head
fixed merge conflicts