Add TODOs and standardize phone numbers, state listings