Performance of and upgrades to the SNS Collimator Sytems