Increae coverage.
Add some architecture stuff.