Added tool check in OnWeaponUse.
Few minor tweaks.