3.0 revisit validation

This takes care of the issues brought in #2585, I will be submitting the documentation changes soon