Some details improved