Tweaks

@dannyroberts a bunch of small changes - see individual commits for list
This was because I found it irritating to keep changing the ID's in the yaml so I just deleted them all and let it auto-assign.

Perhaps should validate that all are unique?