Added some testing of tool retargeting functionality, and the testing actually revealed an issue with the updating code! Well lookathat!