adding weapon names

Also refactored a bit.