Validator fixes and addl content.