Expanded Gun section

Also: added lighter.  We'll need to work that into the intro.