1. correct several issue.