Miscellaneous tweaks
Better way to fix next/prev weapon with gamepad...

...than commit c9f0fc90d4c9ef2554117468f4da284a09252cf4.