Adjusted weapon categories and armor slightly.