Fix some issue and add comment