Add phone number and minor cleanup