Fold #2

There are still some unresolved issues and changes I made that I’d like
you to review. Please run a search for “KG:” comments. You can delete
the “KG:” comments that you approve of.