Weapon tweeks

- Closes #207.