Morning merge

Random, small(ish) improvements.  Had to bring-in vanilla guardian_events.txt to fix-it-up.  Fear not: the vanilla diff is very minimal.