Gunpowder section and misc changes