simplified & fixed "hasModifier" functions