Update auxiliary types w.r.t. password management;
Small style fixes.