added weapons, pruned output tree