Cleanup.
Bug fixes.