Added ph.number to User, other minor changes