Cleanup.
Added a couple consolidators.
Reflect package change.
Add more background.