Fixed toolcharger bugs

Fixed a few bugs w/ toolCharger causing crashes