Editor updates

And minor style updates.