Even more EpicEditor improvements