Some smaller Upgrade Tool Improvements

+Messing around.... meh(