Fix verbiage, add some validations to play with/test