general tidying, plus updates to suit new composite editor
Merge pull request #622 from debrief/features/ian/update_cheat_sheet

general tidying, plus updates to suit new composite editor