Add weapon to attack output
Misc changes