Further corrections to troubleshooting

Simon spotted a whole bunch of issues on the rebased PR #360 - this PR will try to fix them but I need someone to check the actual content issues for me (see the comments on the linked PR).