Earlier check on password validity. Fixes #1.
Differentiated terminology on entry passwords versus master password.