Minor code changes. Changes some of the armor