Whoa. How do we need so many saves here and why were things OK before without all these saves?

Also as long as you're in the file can we clean up the comments to have space between `#` and start of text?