OK, this time we should be done...
Missed quite a few things there in clarifiying the master password, but, this should cover it.