More work on input validation.