Made several significant changes.

I am documenting the fact that this is not going to change.