Update links to Johnie
Add comments