Added mailchimp integration and some minor changes