Improved Projectile and Weapon classes