Integrates the latest editor changes.

 Fixes several editor bugs and integrated the latest changes.