Add some better comments
Merge branch 'linkey' into testing