Adding some design goals.
Various cleanup.