Pulled in composite name updates from other project. Improved phone number validator.