Looking to get some spare pins for the ecm connector - I broke a few while trying to move some harness wires around...

Anyone know a good source and P/N for these pins?

Also a removal tool would be nice - my paperclip will not release tabs..

Thanks
Plaz