Cleanups.
Bug fixes.
Cleanup + small consolidation