#78 rework input verifiers