deeper validation;

4 files changed