Second set of changes

The fact that I didn’t really fuck up the first time. I am now making
some changes again - to see it wasn’t a fluke the first time.