Mark some comments.
Fixed a bug that use a wrong API.