As always, keep a copy of the beta I version, just in case I messed up something here.

Tons of tweaks, plus a mask for phone number!