style corrections
Some changes in weapons check.