Added no passwords message, minor improvements