Merge remote-tracking branch 'chicken-dinner/master'

More updates and linking the "more detail" links