Round 3 fixes - more fixes, only phone number bug exists