Fixed diff issues and added links to diff and unlock lint.