fixing a few more validation errors
fixing a few more validation errors