fixed two of errors