Weapon- and main fixes