Fix $^ so it does not have duplicated entries

Also implement $+
2 files changed