Improvements to Evil Edit part 1