Ensures we have enough weapons and fixed issue #1