[inject] clean up comment threading, add cmd+/