Maks sure we have enough weapons and fixes #3