fixing some issues with the editor