Fixed some sonar issue, fixed some doc issue.
Fixed some typos.