Fix some error and continue to add comment