respond to PR feedback
- couple of TODOs referenceing new issues
- combine Validations with |@|