Editor Updates

This contains the editor updates.