doc fix and validation fix