Fixes

-Replace string comparison with flag check
-Prevent cycling through flagged items and null weapon