Improvement to /gi
Some minor cleanups again...