Even more editor improvement. Love this.

Issue #271