add more tokens to iir
add all iir subopts