fix some issue.

FYI.
add contact.

FYI.