Various polishings, esp around user verification.