Copilot++ improvements, Bug fixes

cursor
~changed 1
✓fixed 1