Some code structure and stability
Corrected weapon callback hook tags