Clean up.
Bug fix.
Bug fix.