Started fixing the weapon system.
Cleaned up the weapon system