Cleanup.
Merged.
Bug fixes.