some styling and verification emails
fixed conflicts