Cleaned up some of the automated output.

Added more design rationale.