Improvements to Evil Edit part 2