Various additions, mostly because the password incident.