Improved Vi Escape Remap, and turned back on host completion