One question I have not seen anywhere else. Since you are trying to keep melee useful and have classes that specialize in it - will there be some form of bayonet that ranged focused characters can equip so they don't have to switch back and forth. What about rules on using the stock/barrel as an improvised weapon?