Numerous changes
I made many changes. Hopefully, I did it all properly.