Cleaned up architecture a bit."
Cleaned up architecture some more.
Fix typos in post.