fixed more validation errros