Added new providers, improved reg expressions, formatted email