Merge pull request #575 from waveney/wav20

Safety Net and Safety Blanket
Mario Upgrades and less spam
Valued Customer (#573)

And ReadMe