diff --git a/scripts/_unpack/225/all.obj b/scripts/_unpack/225/all.obj
index 1777802058..f6a0d45ce8 100644
--- a/scripts/_unpack/225/all.obj
+++ b/scripts/_unpack/225/all.obj
@@ -111,6 +111,7 @@ model=inv_cracker
 2dyan=1728
 2dxan=272
 weight=200g
+param=party_clean_exempt,^true
 
 [skull]
 name=Skull
@@ -229,6 +230,7 @@ recol3d=12448
 2dyan=36
 2dxan=116
 weight=1g
+dummyitem=inv_only
 
 [highwayman_mask]
 model=inv_highwayman_mask
@@ -236,6 +238,7 @@ model=inv_highwayman_mask
 2dzoom=290
 2dyan=224
 2dxan=488
+dummyitem=inv_only
 
 [discofreturning]
 name=Disk of returning
@@ -635,7 +638,6 @@ param=crushattack_anim,human_blunt_pound
 param=defend_anim,human_blunt_block
 param=crush_sound,staff_hit
 tradeable=no
-// param=crushattack_anim,human_axe_chop
 // osrs crush attack sound newstaff / crush attack sound is a guess.
 
 [brokenibanstaff]
@@ -660,6 +662,11 @@ model=inv_farmersfork
 2dyan=904
 2dxan=812
 weight=5lb
+param=stabdefence,3
+param=slashdefence,4
+param=crushdefence,4
+param=strengthbonus,3
+dummyitem=inv_only
 
 [halberd]
 name=Halberd
@@ -670,6 +677,7 @@ model=inv_halberd
 2dyan=400
 2dxan=224
 weight=10lb
+dummyitem=inv_only
 
 [warhammer]
 name=Warhammer
@@ -680,6 +688,7 @@ model=inv_warhammer
 2dyan=456
 2dxan=344
 weight=4lb
+dummyitem=inv_only
 
 [javelin]
 name=Javelin
@@ -690,6 +699,7 @@ model=inv_javelin
 2dyan=1964
 2dxan=268
 weight=3lb
+dummyitem=inv_only
 
 [scythe]
 name=Scythe
@@ -750,7 +760,7 @@ recol1d=15871
 2dxan=84
 weight=20g
 members=yes
-tradeable=no
+dummyitem=inv_only
 
 [seasluginv]
 cost=4
@@ -986,7 +996,7 @@ recol2d=32767
 2dxan=152
 wearpos=feet
 iop2=Wear
-category=category_118
+category=armour_misc
 weight=8oz
 members=yes
 manwear=man_feet_boots,0
@@ -1025,26 +1035,26 @@ tradeable=no
 
 // rename: cert_blondwig
 [obj_2420]
-tradeable=no
+dummyitem=inv_only
 
 // rename: cert_plainwig
 [obj_2422]
-tradeable=no
+dummyitem=inv_only
 
 // rename: cert_skinpaste
 [obj_2425]
-tradeable=no
+dummyitem=inv_only
 
 // rename: cert_ground_charcoal
 [obj_2480]
-tradeable=no
+dummyitem=inv_only
 
 [newbieshrimp]
-tradeable=no
+dummyitem=inv_only
 
 // rename: cert_newbieshrimp
 [obj_2513]
-tradeable=no
+dummyitem=inv_only
 
 [rotten_tomato]
 model=inv_tomato
diff --git a/scripts/_unpack/274/all.obj b/scripts/_unpack/274/all.obj
index 6af383a660..e1b4fd2ad9 100644
--- a/scripts/_unpack/274/all.obj
+++ b/scripts/_unpack/274/all.obj
@@ -15,7 +15,6 @@ weight=650g
 category=58
 param=grindable_ingredient_refined,tbwt_cooked_karambwan_paste
 param=grindable_ingredient_message,You grind the cooked Karambwan to form a sticky paste.
-// param=param_1564,1001
 
 [tbwt_poorly_cooked_karambwan]
 name=Cooked karambwan
@@ -320,7 +319,7 @@ model=chat_male_head_shorthair
 2dzoom=2660
 2dyan=1876
 2dxan=28
-tradeable=no
+dummyitem=inv_only
 
 [pickpocket_guide_farmer]
 name=Farmer
@@ -331,7 +330,7 @@ model=chat_male_head_mediumhair
 2dzoom=2660
 2dyan=1876
 2dxan=28
-tradeable=no
+dummyitem=inv_only
 
 [pickpocket_guide_warrior]
 name=Warrior woman
@@ -344,7 +343,7 @@ model=chat_female_head_longhair
 2dzoom=2600
 2dyan=1856
 2dxan=32
-tradeable=no
+dummyitem=inv_only
 
 [pickpocket_guide_rogue]
 name=Rogue
@@ -355,7 +354,7 @@ model=chat_male_head_bald
 2dzoom=2660
 2dyan=1876
 2dxan=28
-tradeable=no
+dummyitem=inv_only
 
 [pickpocket_guide_guard]
 name=Guard
@@ -367,7 +366,7 @@ model=chat_male_head_mediumhelmet2
 2dzoom=2530
 2dyan=1888
 2dxan=16
-tradeable=no
+dummyitem=inv_only
 
 [pickpocket_guide_knight]
 name=Knight of ardougne
@@ -378,7 +377,7 @@ model=chat_male_head_fullhelmet
 2dzoom=2920
 2dyan=1884
 2dxan=2032
-tradeable=no
+dummyitem=inv_only
 
 [pickpocket_guide_watchman]
 name=Watchman
@@ -388,7 +387,7 @@ model=chat_male_head_mediumhelmet
 2dzoom=2370
 2dyan=1912
 2dxan=28
-tradeable=no
+dummyitem=inv_only
 
 [pickpocket_guide_paladin]
 name=Paladin
@@ -400,7 +399,7 @@ model=chat_male_head_mediumhair
 2dzoom=2510
 2dyan=1816
 2dxan=2032
-tradeable=no
+dummyitem=inv_only
 
 [pickpocket_guide_gnome]
 name=Gnome
@@ -412,7 +411,7 @@ model=gnome_chat_head
 2dzoom=4430
 2dyan=1848
 2dxan=236
-tradeable=no
+dummyitem=inv_only
 
 [pickpocket_guide_hero]
 name=Hero
@@ -424,7 +423,7 @@ model=chat_male_head_mediumhair
 2dzoom=2510
 2dyan=1816
 2dxan=2032
-tradeable=no
+dummyitem=inv_only
 
 [eadgar_fade_to_black_inv]
 name=Dummy
@@ -432,7 +431,7 @@ model=if_eadgar_fadetoblack
 2dzoom=130
 2dxan=512
 code10=eadgar_fade_to_black
-tradeable=no
+dummyitem=inv_only
 
 [01_wind_strike]
 name=Spell
@@ -441,7 +440,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [03_confuse]
@@ -451,7 +449,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [05_water_strike]
@@ -461,7 +458,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [07_enchant_amulet_lvl1]
@@ -471,7 +467,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [09_earth_strike]
@@ -481,7 +476,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [11_weaken]
@@ -491,7 +485,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [13_fire_strike]
@@ -501,7 +494,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [15_bones_bananas]
@@ -511,7 +503,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [17_wind_bolt]
@@ -521,7 +512,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [19_curse]
@@ -531,7 +521,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [20_bind]
@@ -541,7 +530,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [21_low_alchemy]
@@ -551,7 +539,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [23_water_bolt]
@@ -561,7 +548,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [25_varrock_teleport]
@@ -571,7 +557,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [27_enchant_amulet_lvl2]
@@ -581,7 +566,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [29_earth_bolt]
@@ -591,7 +575,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [31_lumbridge_teleport]
@@ -601,7 +584,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [33_tele_grab]
@@ -611,7 +593,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [35_fire_bolt]
@@ -621,7 +602,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [37_falador_teleport]
@@ -631,7 +611,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [39_crumble_undead]
@@ -641,7 +620,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [41_wind_blast]
@@ -651,7 +629,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [43_superheat_item]
@@ -661,7 +638,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [45_camelot_teleport]
@@ -671,7 +647,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [47_water_blast]
@@ -681,7 +656,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [49_enchant_amulet_lvl3]
@@ -691,7 +665,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [50_iban_blast]
@@ -701,7 +674,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [50_snare]
@@ -711,7 +683,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [51_ardougne_teleport]
@@ -721,7 +692,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [53_earth_blast]
@@ -731,7 +701,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [55_high_alchemy]
@@ -741,7 +710,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [56_charge_water_orb]
@@ -751,7 +719,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [57_enchant_amulet_lvl4]
@@ -761,7 +728,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [58_watchtower_teleport]
@@ -771,7 +737,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [59_fire_blast]
@@ -781,7 +746,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [60_charge_earth_orb]
@@ -791,7 +755,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [60_claws_of_guthix]
@@ -801,7 +764,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [60_flames_of_zamorak]
@@ -811,7 +773,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [60_saradomin_strike]
@@ -821,7 +782,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [61_trollheim_teleport]
@@ -831,7 +791,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [62_wind_wave]
@@ -841,7 +800,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [63_charge_fire_orb]
@@ -851,7 +809,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [65_water_wave]
@@ -861,7 +818,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [66_charge_air_orb]
@@ -871,7 +827,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [66_vulnerability]
@@ -881,7 +836,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [68_enchant_amulet_lvl5]
@@ -891,7 +845,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [70_earth_wave]
@@ -901,7 +854,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [73_enfeeble]
@@ -911,7 +863,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [75_fire_wave]
@@ -921,7 +872,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [79_entangle]
@@ -931,7 +881,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [80_charge]
@@ -941,7 +890,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [80_stun]
@@ -951,7 +899,6 @@ model=inv_trail_scroll
 2dzoom=1010
 2dyan=672
 2dxan=360
-tradeable=no
 dummyitem=inv_only
 
 [vampire_dust]
@@ -979,7 +926,7 @@ model=quest_routethrough_inv_snail_corpse
 2dyan=1732
 2dxan=220
 weight=2kg
-// category=category_4
+category=snailcorpse
 param=grindable_ingredient_refined,blamish_snail_slime
 param=grindable_ingredient_message,You grind the blamish snail up into a slimy pulp.
 
@@ -1004,7 +951,7 @@ model=quest_routethrough_inv_snail_corpse
 2dyan=1732
 2dxan=220
 weight=2kg
-// category=category_4
+category=snailcorpse
 param=grindable_ingredient_refined,blamish_snail_slime
 param=grindable_ingredient_message,You grind the blamish snail up into a slimy pulp.
 
@@ -1029,7 +976,7 @@ model=quest_routethrough_inv_snail_corpse
 2dyan=1732
 2dxan=220
 weight=2kg
-// category=category_4
+category=snailcorpse
 param=grindable_ingredient_refined,blamish_snail_slime
 param=grindable_ingredient_message,You grind the blamish snail up into a slimy pulp.
 
@@ -1055,7 +1002,7 @@ model=quest_routethrough_inv_snail_corpse
 2dxan=220
 iop1=Eat
 weight=3kg
-category=category_5
+category=meat
 
 [snail_corpse_cooked2]
 name=Lean snail meat
@@ -1079,7 +1026,7 @@ model=quest_routethrough_inv_snail_corpse
 2dxan=220
 iop1=Eat
 weight=4kg
-category=category_5
+category=meat
 
 [snail_corpse_cooked3]
 name=Fat snail meat
@@ -1103,7 +1050,7 @@ model=quest_routethrough_inv_snail_corpse
 2dxan=220
 iop1=Eat
 weight=5kg
-category=category_5
+category=meat
 
 [burnt_snail]
 name=Burnt snail
@@ -1183,7 +1130,7 @@ wearpos=torso
 wearpos2=arms
 weight=10lb
 category=armour_body
-param=magicattack,8
+param=magicattack,9
 param=rangeattack,-10
 param=stabdefence,36
 param=slashdefence,26
@@ -1210,7 +1157,7 @@ members=yes
 wearpos=legs
 weight=8lb
 category=armour_legs
-param=magicattack,7
+param=magicattack,8
 param=rangeattack,-6
 param=stabdefence,22
 param=slashdefence,20
@@ -1232,7 +1179,7 @@ members=yes
 2dxan=308
 wearpos=hands
 weight=2lb
-category=category_16
+category=armour_hands
 param=magicattack,1
 param=rangeattack,-1
 param=stabdefence,3
@@ -1255,7 +1202,7 @@ members=yes
 2dxan=168
 wearpos=feet
 weight=2lb
-category=category_17
+category=armour_feet
 param=magicattack,1
 param=rangeattack,-1
 param=stabdefence,3
@@ -1275,6 +1222,7 @@ members=yes
 weight=1kg
 
 [viking_toyship]
+dummyitem=inv_only
 
 [flamtaer_hammer]
 name=Flamtaer hammer
@@ -1301,7 +1249,7 @@ model=inv_boots
 2dxan=152
 members=yes
 weight=0g
-tradeable=no
+dummyitem=inv_only
 
 [dummy_shoe2]
 name=Dummy shoe2
@@ -1315,7 +1263,7 @@ model=inv_boots
 2dxan=152
 members=yes
 weight=0g
-tradeable=no
+dummyitem=inv_only
 
 [dummy_shoe3]
 name=Dummy shoe3
@@ -1329,7 +1277,7 @@ model=inv_boots
 2dxan=152
 members=yes
 weight=0g
-tradeable=no
+dummyitem=inv_only
 
 [dummy_shoe4]
 name=Dummy shoe4
@@ -1343,7 +1291,7 @@ model=inv_boots
 2dxan=152
 members=yes
 weight=0g
-tradeable=no
+dummyitem=inv_only
 
 [dummy_shoe5]
 name=Dummy shoe5
@@ -1357,7 +1305,7 @@ model=inv_boots
 2dxan=152
 members=yes
 weight=0g
-tradeable=no
+dummyitem=inv_only
 
 [dummy_shoe6]
 name=Dummy shoe6
@@ -1371,7 +1319,7 @@ model=inv_boots
 2dxan=152
 members=yes
 weight=0g
-tradeable=no
+dummyitem=inv_only
 
 [pickpocket_guide_fremennik_citizen]
 name=Fremennik
@@ -1392,7 +1340,7 @@ model=chat_male_head_viking_helmet_basic
 2dzoom=2660
 2dyan=1876
 2dxan=28
-tradeable=no
+dummyitem=inv_only
 
 [bolt2]
 name=Bolt2
@@ -1403,7 +1351,7 @@ model=inv_crossbowbolts2
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [bolt3]
 name=Bolt3
@@ -1414,7 +1362,7 @@ model=inv_crossbowbolts3
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [bolt4]
 name=Bolt4
@@ -1425,7 +1373,7 @@ model=inv_crossbowbolts4
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [bolts]
 name=Bolts
@@ -1436,7 +1384,7 @@ model=inv_crossbowbolts
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [poison_bolt2]
 name=Poison bolt2
@@ -1451,7 +1399,7 @@ model=inv_crossbowbolts2
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [poison_bolt3]
 name=Poison bolt3
@@ -1466,7 +1414,7 @@ model=inv_crossbowbolts3
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [poison_bolt4]
 name=Poison bolt4
@@ -1481,7 +1429,7 @@ model=inv_crossbowbolts4
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [poison_bolts]
 name=Poison bolts
@@ -1496,7 +1444,7 @@ model=inv_crossbowbolts
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [opal_bolt2]
 name=Opal bolt2
@@ -1517,7 +1465,7 @@ model=inv_crossbowbolts2
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [opal_bolt3]
 name=Opal bolt3
@@ -1538,7 +1486,7 @@ model=inv_crossbowbolts3
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [opal_bolt4]
 name=Opal bolt4
@@ -1559,7 +1507,7 @@ model=inv_crossbowbolts4
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [opal_bolts]
 name=Opal bolts
@@ -1580,7 +1528,7 @@ model=inv_crossbowbolts
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [pearl_bolt2]
 name=Pearl bolt2
@@ -1599,7 +1547,7 @@ model=inv_crossbowbolts2
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [pearl_bolt3]
 name=Pearl bolt3
@@ -1618,7 +1566,7 @@ model=inv_crossbowbolts3
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [pearl_bolt4]
 name=Pearl bolt4
@@ -1637,7 +1585,7 @@ model=inv_crossbowbolts4
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [pearl_bolts]
 name=Pearl bolts
@@ -1656,7 +1604,7 @@ model=inv_crossbowbolts
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [barbed_bolt2]
 name=Barbed bolt2
@@ -1669,7 +1617,7 @@ model=inv_crossbowbolts2
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [barbed_bolt3]
 name=Barbed bolt3
@@ -1682,7 +1630,7 @@ model=inv_crossbowbolts3
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [barbed_bolt4]
 name=Barbed bolt4
@@ -1695,7 +1643,7 @@ model=inv_crossbowbolts4
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [barbed_bolts]
 name=Barbed bolts
@@ -1708,7 +1656,7 @@ model=inv_crossbowbolts
 2dzoom=640
 2dyan=4
 2dxan=244
-tradeable=no
+dummyitem=inv_only
 
 [readbook_dummy]
 name=Readbook dummy
diff --git a/scripts/areas/area_canifis/configs/canifis.obj b/scripts/areas/area_canifis/configs/canifis.obj
index 30cff5edd7..010af5b08a 100644
--- a/scripts/areas/area_canifis/configs/canifis.obj
+++ b/scripts/areas/area_canifis/configs/canifis.obj
@@ -95,6 +95,7 @@ model=inv_gloves
 iop2=Wear
 manwear=man_hands_gloves,0
 womanwear=woman_hands_gloves,0
+category=gloves
 2dxof=8
 2dyof=-8
 2dzoom=930
@@ -202,6 +203,7 @@ model=inv_gloves
 iop2=Wear
 manwear=man_hands_gloves,0
 womanwear=woman_hands_gloves,0
+category=gloves
 2dxof=8
 2dyof=-8
 2dzoom=930
@@ -309,6 +311,7 @@ model=inv_gloves
 iop2=Wear
 manwear=man_hands_gloves,0
 womanwear=woman_hands_gloves,0
+category=gloves
 2dxof=8
 2dyof=-8
 2dzoom=930
@@ -416,6 +419,7 @@ model=inv_gloves
 iop2=Wear
 manwear=man_hands_gloves,0
 womanwear=woman_hands_gloves,0
+category=gloves
 2dxof=8
 2dyof=-8
 2dzoom=930
@@ -523,6 +527,7 @@ model=inv_gloves
 iop2=Wear
 manwear=man_hands_gloves,0
 womanwear=woman_hands_gloves,0
+category=gloves
 2dxof=8
 2dyof=-8
 2dzoom=930
diff --git a/scripts/areas/area_mage_arena/configs/mage_arena.obj b/scripts/areas/area_mage_arena/configs/mage_arena.obj
index 460d38ec18..f23c3082a2 100644
--- a/scripts/areas/area_mage_arena/configs/mage_arena.obj
+++ b/scripts/areas/area_mage_arena/configs/mage_arena.obj
@@ -128,7 +128,7 @@ param=slashdefence,3
 param=crushdefence,1
 param=magicdefence,6
 param=strengthbonus,2
-param=attackrate,5
+param=attackrate,4
 param=crushattack_anim,human_blunt_pound
 param=defend_anim,human_blunt_block
 param=crush_sound,staff_hit
@@ -161,7 +161,7 @@ param=slashdefence,3
 param=crushdefence,1
 param=magicdefence,6
 param=strengthbonus,2
-param=attackrate,5
+param=attackrate,4
 param=crushattack_anim,human_blunt_pound
 param=defend_anim,human_blunt_block
 param=crush_sound,staff_hit
@@ -195,7 +195,7 @@ param=slashdefence,3
 param=crushdefence,1
 param=magicdefence,6
 param=strengthbonus,2
-param=attackrate,5
+param=attackrate,4
 param=crushattack_anim,human_blunt_pound
 param=defend_anim,human_blunt_block
 param=crush_sound,staff_hit
diff --git a/scripts/macro events/configs/antimacro.obj b/scripts/macro events/configs/antimacro.obj
index 1112405e31..719cd1abec 100644
--- a/scripts/macro events/configs/antimacro.obj	
+++ b/scripts/macro events/configs/antimacro.obj	
@@ -9,6 +9,7 @@ members=yes
 weight=3oz
 iop1=Eat
 param=cures_poison,yes
+category=miscfood
 
 [macro_pickaxehandle]
 name=Pickaxe handle
@@ -25,6 +26,9 @@ category=weapon_blunt
 manwear=human_weapons_pickaxe_handle_macro,0
 womanwear=human_weapons_pickaxe_handle_macro,6
 cost=1
+param=stabattack,12
+param=slashattack,12
+param=crushattack,12
 param=attackrate,5
 param=crushattack_anim,human_blunt_pound
 param=defend_anim,human_axe_block
@@ -49,6 +53,11 @@ category=weapon_blunt
 manwear=human_weapons_pickaxe_broken,0
 womanwear=human_weapons_pickaxe_broken,6
 cost=0
+param=stabattack,2
+param=slashattack,-2
+param=crushattack,1
+param=slashdefence,1
+param=strengthbonus,2
 param=attackrate,5
 param=stabattack_anim,human_blunt_pound
 param=crushattack_anim,human_blunt_spike
@@ -75,6 +84,11 @@ category=weapon_blunt
 manwear=human_weapons_pickaxe_broken,0
 womanwear=human_weapons_pickaxe_broken,6
 cost=0
+param=stabattack,2
+param=slashattack,-2
+param=crushattack,1
+param=slashdefence,1
+param=strengthbonus,3
 param=attackrate,5
 param=stabattack_anim,human_blunt_pound
 param=crushattack_anim,human_blunt_spike
@@ -99,6 +113,11 @@ category=weapon_blunt
 manwear=human_weapons_pickaxe_broken,0
 womanwear=human_weapons_pickaxe_broken,6
 cost=17
+param=stabattack,4
+param=slashattack,-2
+param=crushattack,2
+param=slashdefence,1
+param=strengthbonus,5
 param=attackrate,5
 param=stabattack_anim,human_blunt_pound
 param=crushattack_anim,human_blunt_spike
@@ -125,6 +144,11 @@ category=weapon_blunt
 manwear=human_weapons_pickaxe_broken,0
 womanwear=human_weapons_pickaxe_broken,6
 cost=43
+param=stabattack,6
+param=slashattack,-2
+param=crushattack,3
+param=slashdefence,1
+param=strengthbonus,8
 param=attackrate,5
 param=stabattack_anim,human_blunt_pound
 param=crushattack_anim,human_blunt_spike
@@ -151,6 +175,11 @@ category=weapon_blunt
 manwear=human_weapons_pickaxe_broken,0
 womanwear=human_weapons_pickaxe_broken,6
 cost=107
+param=stabattack,8
+param=slashattack,-2
+param=crushattack,4
+param=slashdefence,1
+param=strengthbonus,11
 param=attackrate,5
 param=stabattack_anim,human_blunt_pound
 param=crushattack_anim,human_blunt_spike
@@ -177,6 +206,11 @@ category=weapon_blunt
 manwear=human_weapons_pickaxe_broken,0
 womanwear=human_weapons_pickaxe_broken,6
 cost=1100
+param=stabattack,13
+param=slashattack,-2
+param=crushattack,6
+param=slashdefence,1
+param=strengthbonus,18
 param=attackrate,5
 param=stabattack_anim,human_blunt_pound
 param=crushattack_anim,human_blunt_spike
@@ -291,6 +325,9 @@ category=weapon_blunt
 manwear=human_weapons_hatchet_handle_macro,0
 womanwear=human_weapons_hatchet_handle_macro,6
 cost=1
+param=stabattack,12
+param=slashattack,12
+param=crushattack,12
 param=attackrate,5
 param=crushattack_anim,human_blunt_pound
 param=defend_anim,human_axe_block
@@ -314,6 +351,11 @@ category=weapon_blunt
 manwear=human_weapons_hatchet_broken,0
 womanwear=human_weapons_hatchet_broken,6
 cost=0
+param=stabattack,-2
+param=slashattack,2
+param=crushattack,1
+param=slashdefence,1
+param=strengthbonus,2
 param=attackrate,5
 param=slashattack_anim,human_axe_hack
 param=crushattack_anim,human_blunt_pound
@@ -339,6 +381,11 @@ category=weapon_blunt
 manwear=human_weapons_hatchet_broken,0
 womanwear=human_weapons_hatchet_broken,6
 cost=0
+param=stabattack,-2
+param=slashattack,2
+param=crushattack,1
+param=slashdefence,1
+param=strengthbonus,3
 param=attackrate,5
 param=slashattack_anim,human_axe_hack
 param=crushattack_anim,human_blunt_pound
@@ -362,6 +409,11 @@ category=weapon_blunt
 manwear=human_weapons_hatchet_broken,0
 womanwear=human_weapons_hatchet_broken,6
 cost=0
+param=stabattack,-2
+param=slashattack,4
+param=crushattack,2
+param=slashdefence,1
+param=strengthbonus,5
 param=attackrate,5
 param=slashattack_anim,human_axe_hack
 param=crushattack_anim,human_blunt_pound
@@ -387,6 +439,11 @@ category=weapon_blunt
 manwear=human_weapons_hatchet_broken,0
 womanwear=human_weapons_hatchet_broken,6
 cost=10
+param=stabattack,-2
+param=slashattack,5
+param=crushattack,2
+param=slashdefence,1
+param=strengthbonus,7
 param=attackrate,5
 param=slashattack_anim,human_axe_hack
 param=crushattack_anim,human_blunt_pound
@@ -407,11 +464,16 @@ recol1d=6346
 2dyan=1196
 2dxan=520
 wearpos=righthand
-weight=2lb
+weight=24oz
 category=weapon_blunt
 manwear=human_weapons_hatchet_broken,0
 womanwear=human_weapons_hatchet_broken,6
 cost=18
+param=stabattack,-2
+param=slashattack,6
+param=crushattack,3
+param=slashdefence,1
+param=strengthbonus,8
 param=attackrate,5
 param=slashattack_anim,human_axe_hack
 param=crushattack_anim,human_blunt_pound
@@ -432,11 +494,16 @@ recol1d=6438
 2dyan=1196
 2dxan=520
 wearpos=righthand
-weight=2lb
+weight=40oz
 category=weapon_blunt
 manwear=human_weapons_hatchet_broken,0
 womanwear=human_weapons_hatchet_broken,6
 cost=43
+param=stabattack,-2
+param=slashattack,8
+param=crushattack,4
+param=slashdefence,1
+param=strengthbonus,11
 param=attackrate,5
 param=slashattack_anim,human_axe_hack
 param=crushattack_anim,human_blunt_pound
@@ -462,6 +529,11 @@ category=weapon_blunt
 manwear=human_weapons_hatchet_broken,0
 womanwear=human_weapons_hatchet_broken,6
 cost=427
+param=stabattack,-2
+param=slashattack,13
+param=crushattack,6
+param=slashdefence,1
+param=strengthbonus,18
 param=attackrate,5
 param=slashattack_anim,human_axe_hack
 param=crushattack_anim,human_blunt_pound
diff --git a/scripts/macro events/scripts/mining/macro_event_lost_pickaxe.rs2 b/scripts/macro events/scripts/mining/macro_event_lost_pickaxe.rs2
index b5db251e48..6894c835b4 100644
--- a/scripts/macro events/scripts/mining/macro_event_lost_pickaxe.rs2	
+++ b/scripts/macro events/scripts/mining/macro_event_lost_pickaxe.rs2	
@@ -35,7 +35,7 @@ if (inv_total(inv, macro_pickaxehandle) > 0 & inv_total(inv, $pickaxe_head) > 0)
     inv_del(inv, macro_pickaxehandle, 1);
     inv_del(inv, $pickaxe_head, 1);
     inv_add(inv, $pickaxe, 1);
-    //sound_synth(swordclash3, 1, 0);
+    sound_synth(swordclash3, 1, 0);
     mes("You carefully attach the two pieces together."); // https://youtu.be/tev6FR2iowQ?t=34
 }
 
diff --git a/scripts/macro events/scripts/woodcutting/macro_event_lost_axe.rs2 b/scripts/macro events/scripts/woodcutting/macro_event_lost_axe.rs2
index 1a5cd0b026..266246787b 100644
--- a/scripts/macro events/scripts/woodcutting/macro_event_lost_axe.rs2	
+++ b/scripts/macro events/scripts/woodcutting/macro_event_lost_axe.rs2	
@@ -34,7 +34,7 @@ if (inv_total(inv, macro_hatchethandle) > 0 & inv_total(inv, $axe_head) > 0) {
     inv_del(inv, macro_hatchethandle, 1);
     inv_del(inv, $axe_head, 1);
     inv_add(inv, $axe, 1);
-    //sound_synth(swordclash3, 1, 0);
+    sound_synth(swordclash3, 1, 0);
     mes("You carefully attach the two pieces together."); // https://youtu.be/tev6FR2iowQ?t=34
 }
 
diff --git a/scripts/player/scripts/consumption/consume.rs2 b/scripts/player/scripts/consumption/consume.rs2
index e03b981e14..4a3d215213 100644
--- a/scripts/player/scripts/consumption/consume.rs2
+++ b/scripts/player/scripts/consumption/consume.rs2
@@ -1,6 +1,6 @@
 // ************************* TRIGGERS **************************
 // normal food
-[opheld1,_category_5] @player_consume_item(consume_effect_stat, 2, 3);
+[opheld1,_meat] @player_consume_item(consume_effect_stat, 2, 3);
 [opheld1,_category_58] @player_consume_item(consume_effect_stat, 2, 3);
 [opheld1,_category_59] @player_consume_item(consume_effect_stat, 2, 3);
 [opheld1,_category_86] @player_consume_item(consume_effect_stat, 2, 3);
diff --git a/scripts/quests/quest_barcrawl/configs/quest_barcrawl.obj b/scripts/quests/quest_barcrawl/configs/quest_barcrawl.obj
index b41c517520..5c7955ac3f 100644
--- a/scripts/quests/quest_barcrawl/configs/quest_barcrawl.obj
+++ b/scripts/quests/quest_barcrawl/configs/quest_barcrawl.obj
@@ -9,6 +9,6 @@ model=inv_passcard
 2dzoom=830
 2dyan=1644
 2dxan=404
-weight=150g
+weight=14g
 iop1=Read
 tradeable=no
diff --git a/scripts/quests/quest_chompybird/configs/quest_chompybird.obj b/scripts/quests/quest_chompybird/configs/quest_chompybird.obj
index 09ac740225..abd4ac9cc4 100644
--- a/scripts/quests/quest_chompybird/configs/quest_chompybird.obj
+++ b/scripts/quests/quest_chompybird/configs/quest_chompybird.obj
@@ -134,5 +134,6 @@ tradeable=no
 
 [chompy_bird_obj]
 model=chompy_bird
+weight=1lb
+dummyitem=graphic_only
 // there's a cert, so it must be tradeable and therefore not a dummyitem?
-//dummyitem=graphic_only
diff --git a/scripts/quests/quest_crest/configs/quest_crest.obj b/scripts/quests/quest_crest/configs/quest_crest.obj
index 35acd7299d..34bb105472 100644
--- a/scripts/quests/quest_crest/configs/quest_crest.obj
+++ b/scripts/quests/quest_crest/configs/quest_crest.obj
@@ -38,7 +38,7 @@ members=yes
 tradeable=no
 
 [gauntlets_of_cooking]
-category=category_16
+category=armour_hands
 name=Cooking gauntlets
 desc=These gauntlets empower with a greater ability to cook fish.
 members=yes
@@ -68,7 +68,7 @@ tradeable=no
 param=destroy_drop,^true
 
 [gauntlets_of_goldsmithing]
-category=category_16
+category=armour_hands
 name=Goldsmith gauntlet
 desc=These gauntlets empower the bearer whilst making gold.
 members=yes
@@ -96,7 +96,7 @@ tradeable=no
 param=destroy_drop,^true
 
 [gauntlets_of_chaos]
-category=category_16
+category=armour_hands
 name=Chaos gauntlets
 desc=These gauntlets empower spell casters.
 members=yes
@@ -124,7 +124,7 @@ tradeable=no
 param=destroy_drop,^true
 
 [steel_gauntlets]
-category=category_16
+category=armour_hands
 name=Steel gauntlets
 desc=My reward for assisting the Fitzharmon family.
 members=yes
diff --git a/scripts/quests/quest_desertrescue/configs/desertrescue.obj b/scripts/quests/quest_desertrescue/configs/desertrescue.obj
index 1e24d2c60d..6548e27369 100644
--- a/scripts/quests/quest_desertrescue/configs/desertrescue.obj
+++ b/scripts/quests/quest_desertrescue/configs/desertrescue.obj
@@ -130,7 +130,7 @@ recol1d=14725
 wearpos=feet
 iop2=Wear
 weight=24oz
-category=category_118
+category=armour_misc
 members=yes
 manwear=man_feet_boots,0
 womanwear=woman_feet_boots,0
diff --git a/scripts/quests/quest_druidspirit/configs/quest_druidspirit.obj b/scripts/quests/quest_druidspirit/configs/quest_druidspirit.obj
index 42b4c6f6dc..69dc161144 100644
--- a/scripts/quests/quest_druidspirit/configs/quest_druidspirit.obj
+++ b/scripts/quests/quest_druidspirit/configs/quest_druidspirit.obj
@@ -82,8 +82,8 @@ param=attackrate,5
 param=slashattack_anim,human_sword_slash
 param=stabattack_anim,human_sword_stab
 param=defend_anim,human_sword_def
-param=slash_sound,hacksword_slash
-param=stab_sound,hacksword_stab
+param=slash_sound,sickle_slash
+param=stab_sound,sickle_stab
 
 [bowl_empty_filliman]
 name=Washing bowl
diff --git a/scripts/quests/quest_druidspirit/scripts/ghast.rs2 b/scripts/quests/quest_druidspirit/scripts/ghast.rs2
index 7110e34d83..0908ea6b03 100644
--- a/scripts/quests/quest_druidspirit/scripts/ghast.rs2
+++ b/scripts/quests/quest_druidspirit/scripts/ghast.rs2
@@ -192,7 +192,7 @@ return (true);
 
 
 [proc,is_food_item](obj $slotobj)(boolean)
-if(oc_category($slotobj) = category_5 | oc_category($slotobj) = category_58 | oc_category($slotobj) = category_59 | oc_category($slotobj) = category_86 | $slotobj = rottenapples |
+if(oc_category($slotobj) = meat | oc_category($slotobj) = category_58 | oc_category($slotobj) = category_59 | oc_category($slotobj) = category_86 | $slotobj = rottenapples |
     oc_category($slotobj) = category_120 | oc_category($slotobj) = category_131 | $slotobj = pineapple | $slotobj = kebab | $slotobj = ugthanki_kebab_bad | $slotobj = ugthanki_kebab |
     $slotobj = curry | $slotobj = stew | oc_category($slotobj) = gnome_crunchies | oc_category($slotobj) = gnome_unf_odd_crunchies | oc_category($slotobj) = gnome_batta |
     oc_category($slotobj) = gnome_unf_odd_batta | oc_category($slotobj) = gnome_bowl | oc_category($slotobj) = gnome_unf_odd_bowl |
diff --git a/scripts/quests/quest_legends/configs/quest_legends.obj b/scripts/quests/quest_legends/configs/quest_legends.obj
index f67a479d6f..93a5b1abf8 100644
--- a/scripts/quests/quest_legends/configs/quest_legends.obj
+++ b/scripts/quests/quest_legends/configs/quest_legends.obj
@@ -447,8 +447,8 @@ womanwear=woman_hat_wizards,0
 manhead=chat_male_wizards
 womanhead=chat_female_wizards
 weight=1lb
-param=magicattack,3
-param=magicdefence,3
+param=magicattack,2
+param=magicdefence,2
 tradeable=no
 
 [heartcrystal_sectiona]
diff --git a/scripts/quests/quest_regicide/configs/quest_regicide.obj b/scripts/quests/quest_regicide/configs/quest_regicide.obj
index 5040c5d531..1b05f5b334 100644
--- a/scripts/quests/quest_regicide/configs/quest_regicide.obj
+++ b/scripts/quests/quest_regicide/configs/quest_regicide.obj
@@ -262,7 +262,7 @@ model=inv_meat
 2dxan=308
 members=yes
 weight=5oz
-category=category_5
+category=meat
 
 [regicide_alchemy]
 name=Big book of bangs
diff --git a/scripts/quests/quest_upass/configs/upass.obj b/scripts/quests/quest_upass/configs/upass.obj
index facd999b69..f4ebe4dcf4 100644
--- a/scripts/quests/quest_upass/configs/upass.obj
+++ b/scripts/quests/quest_upass/configs/upass.obj
@@ -236,7 +236,7 @@ iop2=Wear
 wearpos=hands
 manwear=man_hands_gloves,0
 womanwear=woman_hands_gloves,0
-category=category_16
+category=armour_hands
 param=stabattack,2
 param=slashattack,2
 param=crushattack,2
diff --git a/scripts/quests/quest_viking/configs/viking.obj b/scripts/quests/quest_viking/configs/viking.obj
index ce065ba6e8..0d93b5f4e5 100644
--- a/scripts/quests/quest_viking/configs/viking.obj
+++ b/scripts/quests/quest_viking/configs/viking.obj
@@ -1604,7 +1604,7 @@ womanwear=woman_hands_gloves,0
 members=yes
 weight=1lb
 wearpos=hands
-category=armour_hands
+category=gloves
 param=slashdefence,1
 param=crushdefence,2
 
diff --git a/scripts/quests/quest_zombiequeen/configs/quest_zombiequeen.obj b/scripts/quests/quest_zombiequeen/configs/quest_zombiequeen.obj
index 39ed9303ad..1a61ef5589 100644
--- a/scripts/quests/quest_zombiequeen/configs/quest_zombiequeen.obj
+++ b/scripts/quests/quest_zombiequeen/configs/quest_zombiequeen.obj
@@ -214,7 +214,9 @@ param=crushdefence,1
 param=magicdefence,1
 param=rangedefence,1
 param=strengthbonus,1
+param=attackrate,1
 param=prayerbonus,1
+param=attackrange,1
 tradeable=no
 param=destroy_drop,^true
 
diff --git a/scripts/skill_combat/configs/melee/daggers.obj b/scripts/skill_combat/configs/melee/daggers.obj
index 3d98f12c60..5a0114dddd 100644
--- a/scripts/skill_combat/configs/melee/daggers.obj
+++ b/scripts/skill_combat/configs/melee/daggers.obj
@@ -240,13 +240,11 @@ param=magicdefence,1
 param=strengthbonus,40
 param=stabattack_anim,human_ddagger_lunge
 param=slashattack_anim,human_ddagger_hack
-// param=defend_anim,human_ddagger_def
 param=defend_anim,human_ddagger_block
 param=stab_sound,stabsword_stab
 param=slash_sound,stabsword_slash
 param=weapon_poisoned,dragon_dagger_p
 param=weapon_poisoned_message,You poison the dagger.
-// osrs defend anim seq_378
 param=specwep,^true
 param=sa_energy,250
 
@@ -550,11 +548,9 @@ param=magicdefence,1
 param=strengthbonus,40
 param=stabattack_anim,human_ddagger_lunge
 param=slashattack_anim,human_ddagger_hack
-// param=defend_anim,human_ddagger_def
 param=defend_anim,human_ddagger_block
 param=stab_sound,stabsword_stab
 param=slash_sound,stabsword_slash
-// osrs defend anim seq_378
 param=poison_severity,20
 param=specwep,^true
 param=sa_energy,250
diff --git a/scripts/skill_combat/configs/melee/medhelms.obj b/scripts/skill_combat/configs/melee/medhelms.obj
index 40c3305862..febfab808e 100644
--- a/scripts/skill_combat/configs/melee/medhelms.obj
+++ b/scripts/skill_combat/configs/melee/medhelms.obj
@@ -55,7 +55,7 @@ param=stabdefence,3
 param=slashdefence,4
 param=crushdefence,2
 param=magicdefence,-1
-param=rangedefence,4
+param=rangedefence,3
 
 [steel_med_helm]
 name=Steel med helm
@@ -105,8 +105,8 @@ manhead=chat_male_head_mediumhelmet
 womanhead=chat_female_head_mediumhelmet
 category=armour_helmet
 weight=3lb
-param=rangeattack,-1
 param=magicattack,-3
+param=rangeattack,-1
 param=stabdefence,10
 param=slashdefence,11
 param=crushdefence,9
@@ -134,8 +134,8 @@ manhead=chat_male_head_mediumhelmet
 womanhead=chat_female_head_mediumhelmet
 category=armour_helmet
 weight=5lb
-param=rangeattack,-1
 param=magicattack,-3
+param=rangeattack,-1
 param=stabdefence,14
 param=slashdefence,15
 param=crushdefence,13
@@ -163,8 +163,8 @@ manhead=chat_male_head_mediumhelmet
 womanhead=chat_female_head_mediumhelmet
 category=armour_helmet
 weight=4lb
-param=rangeattack,-1
 param=magicattack,-3
+param=rangeattack,-1
 param=stabdefence,22
 param=slashdefence,23
 param=crushdefence,21
@@ -197,8 +197,8 @@ wearpos2=head
 category=armour_helmet
 weight=3lb
 members=yes
-param=rangeattack,-1
 param=magicattack,-3
+param=rangeattack,-1
 param=stabdefence,33
 param=slashdefence,35
 param=crushdefence,32
@@ -230,8 +230,8 @@ manhead=chat_male_head_mediumhelmet
 womanhead=chat_female_head_mediumhelmet
 category=armour_helmet
 weight=4lb
-param=rangeattack,-1
 param=magicattack,-3
+param=rangeattack,-1
 param=stabdefence,9
 param=slashdefence,10
 param=crushdefence,8
diff --git a/scripts/skill_combat/configs/npc_combat.param b/scripts/skill_combat/configs/npc_combat.param
index 15ab6cc46a..041f3d268a 100644
--- a/scripts/skill_combat/configs/npc_combat.param
+++ b/scripts/skill_combat/configs/npc_combat.param
@@ -20,7 +20,7 @@ default=unarmed_punch
 
 [defend_sound]
 type=synth
-default=human_hit4
+default=human_hit
 
 [death_sound]
 type=synth
diff --git a/scripts/skill_combat/configs/ranged/bows.obj b/scripts/skill_combat/configs/ranged/bows.obj
index 83ad68a1b5..3d84c0a815 100644
--- a/scripts/skill_combat/configs/ranged/bows.obj
+++ b/scripts/skill_combat/configs/ranged/bows.obj
@@ -164,7 +164,7 @@ param=levelrequire,20
 param=attackrange,7
 param=rangeattack_anim,human_bow
 param=defend_anim,human_unarmedblock
-param=rangeattack_sound,arrowlaunch2
+param=rangeattack_sound,longbow
 param=damagetype,^ranged_style
 
 [maple_longbow]
@@ -191,7 +191,6 @@ param=rangeattack,29
 param=levelrequire,30
 param=attackrate,6
 param=attackrange,10
-param=attackrange,7
 param=rangeattack_anim,human_bow
 param=defend_anim,human_unarmedblock
 param=rangeattack_sound,longbow
diff --git a/scripts/skill_cooking/configs/cooking_generic/food_cooked.obj b/scripts/skill_cooking/configs/cooking_generic/food_cooked.obj
index b3093e7773..44d99cd995 100644
--- a/scripts/skill_cooking/configs/cooking_generic/food_cooked.obj
+++ b/scripts/skill_cooking/configs/cooking_generic/food_cooked.obj
@@ -15,7 +15,7 @@ recol2d=20774
 members=yes
 iop1=Eat
 weight=600g
-category=category_5
+category=meat
 param=ugthanki_kebab_struct,ugthanki_meat_kebab
 
 [cooked_chicken]
@@ -31,7 +31,7 @@ recol1d=13472
 2dyan=1748
 2dxan=88
 weight=5oz
-category=category_5
+category=meat
 respawnrate=200
 param=pizza_topping_struct,meat_topping
 param=uncooked_pie_struct,uncooked_meat_pie
@@ -52,7 +52,7 @@ recol2d=20774
 2dyan=176
 2dxan=308
 weight=10oz
-category=category_5
+category=meat
 respawnrate=200
 param=pizza_topping_struct,meat_topping
 param=uncooked_pie_struct,uncooked_meat_pie
diff --git a/scripts/skill_crafting/configs/leather/leather_gear.obj b/scripts/skill_crafting/configs/leather/leather_gear.obj
index aa24574906..9dce452f6f 100644
--- a/scripts/skill_crafting/configs/leather/leather_gear.obj
+++ b/scripts/skill_crafting/configs/leather/leather_gear.obj
@@ -7,7 +7,7 @@ iop2=Wear
 wearpos=hands
 manwear=man_hands_gloves,0
 womanwear=woman_hands_gloves,0
-category=armour_hands
+category=gloves
 2dxof=8
 2dyof=-8
 2dzoom=930
@@ -75,7 +75,7 @@ iop2=Wear
 wearpos=hands
 manwear=man_hands_dragon_vambrace,0
 womanwear=woman_hands_dragon_vambrace,0
-category=category_16
+category=armour_hands
 weight=10oz
 param=magicattack,-10
 param=rangeattack,8
@@ -320,7 +320,7 @@ iop2=Wear
 wearpos=hands
 manwear=man_hands_dragon_vambrace,0
 womanwear=woman_hands_dragon_vambrace,0
-category=category_16
+category=armour_hands
 weight=10oz
 members=yes
 param=magicattack,-10
@@ -350,7 +350,7 @@ iop2=Wear
 wearpos=hands
 manwear=man_hands_dragon_vambrace,0
 womanwear=woman_hands_dragon_vambrace,0
-category=category_16
+category=armour_hands
 weight=10oz
 members=yes
 param=magicattack,-10
@@ -380,7 +380,7 @@ iop2=Wear
 wearpos=hands
 manwear=man_hands_dragon_vambrace,0
 womanwear=woman_hands_dragon_vambrace,0
-category=category_16
+category=armour_hands
 weight=10oz
 members=yes
 param=magicattack,-10