fixed more validation-errors