fixed some issue.
fixed some modified.